From: Peter Michael Green Date: Sat, 12 Oct 2019 12:56:39 +0000 (+0000) Subject: Remove build-conflicts on python3-sphinx X-Git-Tag: archive/raspbian/1%10.0.0-1+rpi1^2~8 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=88acd5fbfba756289a26f11f4f72b0e76da02569;p=llvm-toolchain-10.git Remove build-conflicts on python3-sphinx --- diff --git a/debian/changelog b/debian/changelog index e800740e0..b365f980b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,10 +34,6 @@ llvm-toolchain-9 (1:9-1+rpi1) bullseye-staging; urgency=medium [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] * Change triplet in debian/rules to use armv6k rather than armv7l - [changes introduced in llvm-toolchain-8 1:8-3+rpi1 by Peter Michael Green] - * Add build-conflicts on python3-sphinx, if it's installed the build tries - to use it and finds missing extensions. - -- Peter Michael Green Sat, 12 Oct 2019 11:55:18 +0000 llvm-toolchain-9 (1:9-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 3d686f7af..ce37ddf58 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], libpfm4-dev, python3-setuptools, g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7 -Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev, python3-sphinx +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 9